bitkeeper revision 1.1709.1.8 (42af269d6Px0KYHtwIY_0xme35-rbg)

Different dom_mem_op for non-VTI (at least until discussed)

diff --git a/xen/arch/ia64/hypercall.c b/xen/arch/ia64/hypercall.c
index 5a80855c7c12a454e3af7416acee32cfed3b7373..648bbfbbe8aba444c206ae0892e26a7e7a439a54 100644 (file)
--- a/xen/arch/ia64/hypercall.c
+++ b/xen/arch/ia64/hypercall.c
@@ -126,8 +126,12 @@ ia64_hypercall (struct pt_regs *regs)
                break;
 
            case __HYPERVISOR_dom_mem_op:
+#ifdef CONFIG_VTI
                regs->r8 = do_dom_mem_op(regs->r14, regs->r15, regs->r16, regs->r17, regs->r18); 
+#else
+               /* we don't handle reservations; just return success */
                regs->r8 = regs->r16;
+#endif
                break;
 
            case __HYPERVISOR_event_channel_op: